Move installed tools into target/tools

diff --git a/rust-bindings/rust/.gitignore b/rust-bindings/rust/.gitignore
index 64e0a74b9866bdc81d817ba131ebb9c6e18de130..def5874b41eecaa86e5a04f61c2002b0d0d513ac 100644 (file)
--- a/rust-bindings/rust/.gitignore
+++ b/rust-bindings/rust/.gitignore
@@ -1,5 +1,4 @@
 /.idea
-/tools
 **/*.rs.bk
 target/
 Cargo.lock

diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile
index 94b65b55a51d6944d5e044ad7d1971f3fdbac1f1..09dccb8f9f55e96cfc19d497f974cb4f6d34c59a 100644 (file)
--- a/rust-bindings/rust/Makefile
+++ b/rust-bindings/rust/Makefile
@@ -10,11 +10,11 @@ pre-package:
 
 
 # -- gir generation --
-tools/bin/gir:
-       cargo install --root tools --git https://github.com/gtk-rs/gir.git -- gir
+target/tools/bin/gir:
+       cargo install --root target/tools --git https://github.com/gtk-rs/gir.git -- gir
 
-gir/%: tools/bin/gir
-       tools/bin/gir -c conf/$*.toml
+gir/%: target/tools/bin/gir
+       target/tools/bin/gir -c conf/$*.toml
 
 generate-libostree-sys: gir/libostree-sys
 
@@ -22,12 +22,12 @@ generate-libostree: gir/libostree
 
 
 # -- LGPL docs generation --
-tools/bin/rustdoc-stripper:
-       cargo install --root tools -- rustdoc-stripper
+target/tools/bin/rustdoc-stripper:
+       cargo install --root target/tools -- rustdoc-stripper
 
-merge-lgpl-docs: tools/bin/gir tools/bin/rustdoc-stripper
-       tools/bin/gir -c conf/libostree.toml -m doc
-       tools/bin/rustdoc-stripper -g -o target/vendor.md
+merge-lgpl-docs: target/tools/bin/gir target/tools/bin/rustdoc-stripper
+       target/tools/bin/gir -c conf/libostree.toml -m doc
+       target/tools/bin/rustdoc-stripper -g -o target/vendor.md
 
 
 # -- gir file management --